refactor to latest blueprints