Commented out zoned system to get around problem