additions from another file that I had on hand