removed references to zones
removed references to zones
functional version