Removed pointeless || false statement. Made sense at the time:>