first rev of project
Fix problem