tweaking as I get ready to make this part of Zap