Finished CJL changes