Made regen slightly less of a hack