Updating with Gabe's edits