PR: useful changes

Please accept this very useful patch