Changed dynamic format names.  Moved the expression to the algorithm section