applied Tony's feedback