reverted to Mattans version to see if I can backwards engineer my issue