Added starting and stopping of shape animation