Updated some changes please review