Made changes for CJ