now... add the HOFs changes