Updates by Jones & Wagener