with #234, can you please update this to avoid code duplication?