Improved a bit of the design features