Implemented requested changes