First attempt to migrating to rtl