Change to work on raw ids
Update some stuff