Migrating current/latest version to Kalle's ViewControlled version