Updated with overflow changes