Updates by Woodard & Curran