Completed some changes