adjusted for use in Eclipse