Minor change
Finish upating users modules
Bug fix on only