Refactored for Meteor