Update to use Ojquery