Added post processing