Updated with Trey's comments