Version after Alex's comments on 1/29