Adding in cookie control to the previous commit @9606a603bb