Implemented some requested changes