changed fade stuff