Merge "Refactor brillopad"