Changed to Kotlin