updated to use 6.28 core