Final changes per Joe's review