Added Overflow Control