additional changes in mainuser