addition to refactor

and camerathing