Refactor of pick power