making progress on solver