fill_holes + mc_table + traits added