Implemented several requested changes