Made the composite shape only be updated after any shape movement (i.e. animation) is completed.