Initial merge between both projects