Yaniv changes

Is this needed?