rename and add features