Added stop back in