modified by kubota