Working on updates toward 1.9