**Is your feature request related to a problem? Please describe.** Makes these functions 'smarter'.
Is your feature request related to a problem? Please describe.
Makes these functions 'smarter'.