Removed use of saddr as a variable name which conflicts with usage in