moved functionality to use core