@nowhereman It might be worth just tracking protein to make sure you're on track. It will be way easier than full calorie and macro tracking and you've clearly not gained a huge amount of fat in 2 years so your diet isn't way off base anyway.
Even if it's just a sense check for a couple of...
