Improve Meteor demo