Add latest changes. A lot of them