removed some hardcode from control script