Added post-processing