switched to global parameters
minor frobit mods