Updated per feedback from the IG