First changes commited
Final draft