Debug

Debug refactor.