Todo
Pathway, tweaks