more animation, index tweak