refactor pool after queue