reverted last, rmoving nzedb for now