Updates to bin/listen