QT editing, also checkpoint so the less we have to fix if we have to