New version done

But still one more bug