Implemented enhancement #4