updated for core 0.6.4