needs to fix animations