Edit mine to include the new stuff.