Added additional logic & listeners