Liv fixing bug1

merge initial structure