Removed some hardcoded