had to fix war/jdo