begin restructure per Dmitry and Maria