debugged for export from eclipse. ready for submission