Updated to the latest TOX core