rename and add exception