Touched up some code for single-tasking