Add exceptions
merge from camera