Committing final changes made by Daman