Little change and debug.