new fixes
commit error...