Couple of modifications using new add|remove|toggleClass API and improved child event subscription.