Modified solver and ui