Update with last changes. From now, all changes should be tracked in detail