added solve-class