updated to new design