- refactoring post-3 and post-4 code