update with MJ's feedback