pull in extra heart stuffs from 1.6 warning: probably will fail serverside