Made some change

@alberto99 please have a look at this.