Some more change from eclipse