Should now be checking for wietpas