Rework addition a little