add partial current HW solutions