Rework camera handling