added Scala stuff