Fixed controller pivot and removed lamda operator