added scala back in