added fixed effects part