changes per a discussion with Chad