Feature/jose/changes