Fixed merge conflicts
Animation queues added