even more migration of components