Implemented requested changes

Had a look and implemented your requests.