Yaniv changes