Camera.cpp changes