Updated version and feedback