Feature/adjust controller