fixes #1 - demo rebase staging