Reworked for eclipse