final support-code touches