Forgot to ci this changes
added subscription logic