merge with kendalls camera update