Refactor (camera), other suff.