Scala part updated