final versions to send to Eclpse
2 files changed