Redesign examples a bit