before statrt working
merged