More work on the same stuff.