did lots of updates on the design...