Added additional debuggin