Modularization
Tried introducing cancellable
make it work without switching pages back and forth