Made some changes to the overflow control.