Changed around some listener names and order.