rename and streamline f$