reorg and make script not be so forgiving to wait for camera to come
back