Syntax and format changes per Gabes request