merge andy's commit