Adding start and stop... fixing issues with first time