update for new component convention