made timing changes, messed with fading