Added phone and moved all running to end