completed manual implementation + integration