merged carles changes