Attempted to fix fade math, more testing needed