updated, added waps