continue restructure per Dmitry and Maria