readded wpa stuff