Scala Conversion Pass 4