Some adjustments to my taste