WIP improve debug