Finished with logic working
last changes