major upgrade to new design