Some changes

I hope you find it useful