Full review (do not merge)

Ok, I can replace it.