Tentative view guys. Change to animation handler only temporary.