Per Sergios note, updated two files