updating to match johns files