1) revert to sarah's version 2) add timing versions