new build after merge of navigation branch