Updates after Mark's feedback #2