Fixing merge from stashed changes
Working on fader - reverted most changes