Commited final changes