Added temporary animation and minor comments