Version two final code push