Major burek refactoring part 2