add Camera + small optim