Moved back to debug