Updated for latest versions