Refactored and updated demos