Add overflow basic logic