merged from theDazzler

hoping this works…