Modified to more closely match enCORE setup