Modified file per peter's request