Final exploratory code updates