Minor changes before sharing with the guys at work.