fixed even better ID solution
fixed ID's more
fixed merge conflict