some of Chris changes for John