Change from java to scala
Change from java to scala