Added graddle related stuff