Removed the stop service and added a resync

Also added before clauses to better control the flow.