My changes
Changes fron heejong
Included all changes by Prof. Salcic