deleted and changed things