updated for latest revision