Some more work on top of postprocessing.cpp