modified to gradle