Before merge
Added to conclusion