Added split for a few that were missing it and replaced the last 5 chars from every time we &&&