user generation fixxed