changed order of components