Improve/terminals