change for a cleaner gsub!