improved controller a lot