Can now substitute on addresses