Almost working completing with offline buffer