Upgraded the cookie system for user friendliness