Updated to work on JB+.