Add animation & locks