refactor papa2