saving this to go back and check old version
Debugging .... :(