Make sure service called at appropriate times
Removes unnecessary instruction
Changes name to depth