Final changes

done on 8th march