Modified some things