Add timing comparisons and clean shape adds