Implemented some changes.