Version 2

Basic changes to cookie