Add in debug logic (2)