Modified Main & Controller Classes