added scala stuff