Added timing closes #1