Updated to keep compiling, raised target to 6.0