updates for main class change