I've changed my diet a bit.
On training days I'm taking in about 2200 calories, and on non-training days I'm doing a PSMF. Still eating in an 8 hour windows a la Leangains.
I'm probably going to continue doing that until I have some muscle loss... but I have an incredibly slow metabolism and tend to hold on to muscle, so hopefully that'll be a while.
