bring inline with gaia-components