rename and add some args and description