Animation fix, test with input