fixed quentin suggestions