follow @sat_toke's feedback