Add animation; make more consistent.