Modified some things briefly