Version two looks much better