Much better rework on tech view