added debug features