7 Update

Next to be updated, later today