Updated for ScalaX preso