Updated CC popup trigger

Close #105