Updated CJ's demo