third commit
new structure of code