Minor changes to the design