Listener update, performance test update