Revision

Changes made as requested by WrinklyNinja.