Trying to make the whole thing work with newer meteor version