Improvement for cmdListen