Commented overflow changes