Modified some solutions