Applied changes from Dario.