added new listener callbacks to track SAs