Simplifed code path for readability