7.1 support (beta)