cleanup
use new Bus
push the stage instead of saving it thus removing dependency