changes under #1