Refactored OR methods & join methods