with updates to main class