Some slight changes to the basics