last merge of edumed-red not complete