remove and add some hardcoding