forked of more eclipse stuff