Update to match blackfriday changes