more work on solver