Modifications after Mark's feedback #4