Added more logging to see what's going on