Modified some more