update for new syntax and semantics from Rick Macklem