Unifying

I prefer to have all the assignments together, I hope this is not a problem for anyone...