Changed from eclipse