Added Grandle compatibility (maybe)