Yosi comments implemented