Added some debug in