- updated case structure