finaly some changes