hand merging tyson's custom function upgrades