changes for 1.8 I guess?