Modified ui and solver