[MOD] Modified some things