Updates to add more logging to see why its not working