removed camera
added simpler implementation