fixed all and all is working as was