GO-1111 changes