bo | major refactor