Animation improvements -- should be more robust