minimal changes after initial import on eclipse