added Q10 support