Port to 1.8 complete