tweaks based on shifu's feedback