Updated the design again