Some updates to solver