Small modifications to the design