Issue70 profile names2

I just rewrote this. 
change "or" to "and" on above line