preparing to merge camera stuff