Making this version the same as the one in the Sessions branch.