Some more enhancement while I am fixing issue #2