yes, just not in this commit... anyways I wanted to remove the recursion