modified controller
fixed controller