Added camera stuff to m2