Improvements on the post processing