updated and moved these to main sc 3.7.0

keep them around here for compat with older sc versions.