changed names and formatting