last fixes !!!!11