Minor changes to the design and additional comments