integrated Quentin's level and bug fixes