Added some debug logs