Added Controller code