Moved overflow back, and tiny mod to pre