no longer assuming email and various other things