Modifications after Mark's feedback #5