add Stefano's and Yike's feedback