added some debug features