Updated from current ManickTechResearch dev build