Removing IfElse dependency; Tidying up logic; Added blocking subscriptions