first round of changes for FitId