A few changes to the better