Updated to newest Eve 3.0 code