modified to allow common area
Merge branch 'origin/wisp'