rename and add stuff