Fixed and improved controller structure