change percolator to express + refactoring