Fixed Misssing loop and camera

CRITICAL UPDATE DO NOT REVERSE TO 2.12.2013 CHANGES