added a few post office tools and refactoring code