Speed up/fix zprompt logic