updated to be latest Gradle compatible