updated solver and examples