Switching to Scala