need fix solver. it became faster