need to fix non-linear and concl