Revisions from a smarter guy than me