Added in some listeners.