Yes! I have just discovered this recently myself as well: whenever I wander off I context switch to something else I want to do instead of reforcing focus: multiple books, work, anki, side projects. Good so far.