Review

a lot of code changed
same as above