Addittional documentation added + zone checking