1.6 decision fixs

Decision Fix + Canals