More design for V2.0.