complete matrix migration from jama, draft revision