Changed to use infinite loop and changed control folder