Updated for Eclipse