Improves demo