Updated for Eclipse.