removed some hardcoding