*Recent update with HB-1032, not yet implemented