Implemented enhancement #5