Ed's 1st changes