changed names to be more managable