updating to edna's version