More work on post-processing