modify on 20140628 PM, add the group feature