Changed some hardcoded values