Changes from iYo session