Implemented some changes