Adapted to Eclipse