Updated with requested changes from Grayson.