Changed how subscribing works