There we go (fixled last bugs)