Updated Q and removed deprecated ncall invocations.