Add my changes to peter's