some design improvements for engineers functionality