addressed Andy's XXX questions