Restructured Controller