Update code to make debugging easier