added fading, sort of
added better fading