edits from eclipse