Some cut-n-paste mods.