Added missing listeners, oops!