Added debuging code