Updated -A (no animate) code

it is now further decoupled from the animation code