Modified to new post-processing call format