Many tweaks and a new design