This is for 1.1, has little to no applicability any more :(