delete w.a. + added 2 funcs