Added scala mode 2