Changed substituted onpcalc with shared lib
Removed onpcalc, added signature