Covert old f-n code to new f-n code
More work