Revision after Brandon's comments I