BIG MERGE! (resolved camera problems?)