Complete change of design
fixes everything for D1