Added cookies
Merge fixes