test new logic - first commit
fixed bug
fixed bugs - cleaned code