upgrade for new ilshad/layout API