removing some hardcoding