working version of the new design