Updated following Oscar's feedback