Implemented enhancement #2