final commit retrace design