Updated to run with core 2.1