Added ONP calculator