saving last changes
mostly working except the and issue
new commit