Zeek's changes