removed some hardcoded vars