Updated authorization + Updated Controller