Upgraded to current Gradle