I included this work in the clips PR