few changes on the design