Changes in response to Vic Liu's feedback