Changes in Classes and Controller