removed circles for now as they're slowing down the rendering
Merge branch 'walport-water' into testing