rename and make it works