merged changes from camera work branch