Replace hard-coded tank combinations with function