Updates after Mark's feedback