updates changes from yaron