Added camera and polished the rest