latest changes Carles
final changes, should be done now