More migration of logic