add zone and minor fix
merge conflicts