2.2 little modify