Animation only for current conditions, fixing time frame bug