changed order of components for tap use