changed most occurences of  to  or