Revert "Using select"

This reverts commit c7fcf7b518722f8c54003025332db4f81c36672f.