Added more debbugging fetures