Updated with work from 13 Nov