many changes, vector packing sort of works