yesterday's changes with subscribe and some other clarifications