Incorporate TingPing's feedback