Updated per the comments from Titus Winters Aug 20