changing hard-codings from *03 to *