Fixing stop, just pulled it out and made it a simple function, most of these can be handled this way.