refactoring rinnovo, breaking commit