Modified for enCORE setup only