Working on fixing ID assignment