Updated fading and input wait