Merged fade 1 and fade all code