Final commit -2 with some changes