2 more cookies refactored