implemented requested changes