refactored post-block