Make it more 1.8 compatible