removed some hardcoded values to variables.