Removed some hardcoded values