implement Davide's comments