Improved controller !