model modifications
now the project have a most simple solution!