replaced the "echo on" stuff with just the @  so that calling scripts don't get that changed.