berfore merge with Valik