done improving cookie management