delted that
Merge branch 'locality'