Added some more CJ stuff