First big change

further repair