fixing & changes