Animation fix and actor implementation