More update

Github didn't see all the changes I guess