updated for adding debug tool kit