Review

a lot of code changed
this as well