Upgraded to gradle