camera added
Merge together classes