fixes to my impl