Overview Update and short code conflict issue