Updated with changes from Nov 4