Adjust modules
Implement Or logic