Implemented enhancement #1