Improve solve case