replacing some hardcoded values