Readying for 1.8