inline demo. updates from feedback