Unique code generation - bugged
Merge