Better stripped filling

and temporary diamond fix