Easy eclipse-ification added