fix in camera, need to change design too