serveral minor changes;pass values active/inactive