del and some changes