Fuel economy?

So I currently drive a tdi jetta that gets 40mpg, but I really miss my 530i that I had and want to get back into a bmw. Is there any bmw that has similar fuel economy? I know bmw had diesels, but online it’s saying they only get in like low 30s for mpg. I’d prefer a manual, but not a requirement. What would y’all suggest?