Revise for 1.8+