Better state expansion