tried unsuccessfully to fix deleagte issue

… but I think I made some progress?