Applied more of Tony's feedback