changes on id handling