wip #28: Id changes