Pulling in Shu's stuff
Pulled in loop and Shu's stuff into a single file