Updated to current non beta 6 branch