Modularize the code. Add a unique post filter