more postTools refactor