ngriffiths21 update for next version