added peter's stuff