add stop, remove title checks