Add upper limits and fix misplace 'ADE' and 'BDE'