last changes from fresh x2 :)