Updated with comments from Bill