changes for overflow