Merge Add missing code from SmillerDev