fixing one last "or" within if conditional