refactoring demos to support radiatus