modified for eclipse project