Back to Eclipse, almost done for update