Touching up versions after talking with erikh