pushing up more work on the content-upd branch