updated for latest versions