Updated some changes