merged zone plugin with falconne's additions