Refactor for more casestudies and optimization for cip pool pcs