Adding in some additional loggin to see what's going on