not slow anymore
Merge branch 'sam'