Added pool-x pool. Minor refactoring.