merge of wupiti with minh's design