Modified some problems