Commited final version