Modified some stuff