Added changes based on ccokies setted