better legacy support