Version 1.0.0 with new logic from mk_oracle.new