10.10 support, will break older builds
more 10.10
merge