Updated to non beta