Move post processing to root