some more changes post go-live