Now passes package as arg, instead of this