update on 11/20 and merge with master