Update per suggestions