migrating more components