Added SS Grad etc. untested