Is edit two closer to how you want it ?