Updated with upstream requests