modified subscribe behaviour