changes to the uid creation