merging with master, still need to fix animals on both players