removed some hardcoded var numbers