fix animations and Controllers