Updated with extra argument