- renamed class
- added some debug code