Simplified logic to only use available data