2.1.4 finaly updated sause code