Slight changes to realign with topologize