Code tentatively merged.