Improved post-processing