Revert "Reverted some post changes"

This reverts commit 11ccd14a598a19bebeca0eddac104e331c281d71.